tools-xentrace-prefix.diff

Patch-Name: tools-xentrace-prefix.diff

Gbp-Pq: Name tools-xentrace-prefix.diff

diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index 6c13cd1aa5a8b295e8f7358177cdef321f460af4..a436718564b3a9bd74a0924056d9b8f21c58a2e4 100644 (file)
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -5,6 +5,7 @@ CFLAGS += -Werror
 
 CFLAGS += $(CFLAGS_libxenctrl)
 LDLIBS += $(LDLIBS_libxenctrl) $(ARGP_LDFLAGS)
+LDFLAGS += $(call LDFLAGS_RPATH,../lib)
 
 BIN-$(CONFIG_X86) = xenalyze
 BIN      = $(BIN-y)
@@ -20,15 +21,9 @@ build: $(BIN) $(SBIN) $(LIBBIN)
 
 .PHONY: install
 install: build
-       $(INSTALL_DIR) $(DESTDIR)$(bindir)
-       $(INSTALL_DIR) $(DESTDIR)$(sbindir)
-       [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
-ifneq ($(BIN),)
-       $(INSTALL_PROG) $(BIN) $(DESTDIR)$(bindir)
-endif
-       $(INSTALL_PROG) $(SBIN) $(DESTDIR)$(sbindir)
-       $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(bindir)
-       [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN)
+       $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
+       $(INSTALL_PROG) $(BIN) $(SBIN) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN)
+       $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(LIBEXEC_BIN)
 
 .PHONY: clean
 clean: